Removing old template stuff.
New master template