Clean up artifacts
Half working builder that desperately needs refactoring.