Boilerplate cleanup