Removed lots of old code.