Removed unnecessary commenting (unnecessary because the old code that was commented out is in our version control)