This needs a comment on why this commented out or it should be removed. Same for code above.