Remove boilerplate cruft