Remove more boilerplate