Is there a reason for the commented out code?  Is it just not integrated yet... or did you copy over commented out code?  If this code can be found in the other contact objects I would vote for removing it here (we try to not check in commented blocks like this).

But I understand if you have a purpose in keeping it temporarily...