Cleanup. Lots of old, neglected code deleted.