Removed some left over useless classes