tighter coupling of build/repo; cleanup