More cleanup. Starting to update uml.