Removed commented out code

Signed-off-by: Martin Owen <martin.j.owen@btinternet.com>
Moved highlighted and postscript zones in tpl files

Signed-off-by: Martin Owen <martin.j.owen@btinternet.com>