Clean unneccessary classes