WIP minor cleanup