WIP last of the cleanup