remove un-needed logic