more boilerplate cleanup