Cleanup: Removed unused templates