update boilerplate
remove redundant #includes