WIP: cleanup 2