JS-Code cleanup

This makes exaclty the same as before.