Remove unused logic