Removed legacy code block. Seems done