Removed some more dead code
Templating fixes:
 - statements (assign, call, if, while) should not generate a line return at the end
 - lists of statements (actionword, scenario, if, while) add the line return between each statement