deleted obsolete code (a whole bunch)