cleaning up JS for now