Cleanup unused boilerplate calls