WIP: more cleanup