remove jsnaiad, and remove double media query