removed lots of obsolete stuff