finish merging plip 13270
remove s5 javascript