removed un-needed classes