deleted a bunch of obsolete code