remove js3 things, put back js2 with patch, more stuff from magnars and some clean up