Removed old unused classes