Removing deprecated shiz from templates