further semi manual cleanup, this time on javascript