Support for Make templates
Cleanup