remove boilerplate code