Remove boilerplate code