Code clean up
-useless classes