WIP on cleanup. Interim commit. Squash later