removed un-needed logic