remove some unnecessary boilerplate