Remove additional boilerplate.