Clean up boilerplate