Cleaning up, removing unneeded class