let's not comment out, let's just delete.  This should all be in the sdk 2.3 branch anyway