Cleaned up rebase garbage