code cleansing

removed legacy code