removed misleading comment
removed unused templates