Remove all reference to System Templates which are being removed from Ka...

...tello