Also, remove boilerplate.