Commented dead-code