Remove unnecessary functions

A few legacy items from the original templates