Build changes, remove debugging cruft