remove unnecessary line that was causing errors in some browsers
stick that stuff in an else
dont use this anymore
Merge remote-tracking branch 'upstream/master'