make lint, tests pass in aftermath of cleanup