Remove extra boilerplate stuff.