WIP: cleanup 4