Extraneous boilerplate cleanup.