#1202 Removed legacy code