Cleaned rebase