Cleaning project and rebase