remove unnecessary boilerplate