Clean up from rebase