Removed uneeded classes, main now working