Removed unused logic