removed a bunch of obsolete code