remove more boilerplate