remove un-needed class
removed un-needed class
todos up-to-date