A few more cookiecutter cleanups