Removed some old unused classes and features