Removed legacy junk