Removed lots of obsolete stuff