Same as above, I think you should add a comment as to why these are commented out, so we know what to do with them in the future.