dodgy template if statements removed