Cleaned unused code; removed unused classes