js cleanup part 2