get rid of unused logic