Should this be uncommented or removed ? (same goes for similar comment above)