More JS cleaning