Removing unneeded class