Replace use of git clean with manual clean
Split logic into services