used git -rm to remove refactored files... has to be a simpler way