[TASK] Clean up JavaScript

Change-Id: Idd96a976a828ce145b299f470443d40416384f44