Removed unused template code