Merge "Remove unused code / classes"