re-enable lamp-post generation
lots of cleanup on templates included in the project