Removing un-needed classes