Remove unused templates during split step
Removed unused code