clean up unused boilerplate code