Start cleaning up JS