Rebase on pulls and remove git features