Refactor according to Raymond's suggestion

   It was not a good idea to use an :around method as a way to factor
   boilerplate as it splits the primary logic. Using a macro instead
Add git-remove to the 'wrapper'