Remove extra boilerplate we don't need