Remove unnecessary boilerplate.t