WIP some cleanup