Remove unecessary classes