Cleanup js variable declarations