CE-26 Removing Default template
CE-26 Back to the roots - non Nirvana style of setup file
CE-26 Adding comments, removing unused code