Cleaned up rebase artifacts