remove some boilerplate