Fix earlier folly (commented and useless code)