WIP cleanup after rebase