Remove dependencies and evolution rebase