Removed legacy code for previous functionality