More cleanup, removed useless classes