Merge "Remove dead code #11: Remove more unused classes"