remove commented out old code
more comment updating