removed unused logic