Don't need that JS stuff.
some changes