Fixed unnessesary classes