remove dead code and clean up in new with-git step