js cleanup part 2
TODO: commit management