Cleanup from massive rebase