Cleaned up the rebase file