Removed lots more obsolete stuff