Removed old and useless classes