cleanup + added more clean tag checkout