Remove unnecessary code. Fix js/#1