Remove more unused code, rename classes