removal of boilerplate