WIP more cleanup