Remove currently unnecessary boilerplate code