Remove useless boilerplate code