Cleanup unused boilerplate. Add comments