re #91: Cleanup template package