WIP: cleanup continued...