Begin removing old functions from pre-1.3 template structure