remove more unnecessary boilerplate