Add the concept of an "operator"
Remove unused template