cleanup removed legacy stuff