take out unused logic, as of now