More cleanup. Sorted the obvious relations.