Remove commented out code.

This is possible after Shlomi's contribution. Thanks!