Some cleanup (wip)