Manual Rebase and Cleanup