WIP-4 - cleanup