Simply build targets and clean-up method from John Ford's comments on pull request.