- removed all unneccessary classes