Removing not needed quotes, as last js is not quoted correctly (cherry picked from commit 67fdb81) (cherry picked from commit ffca3fa)
remove deprecated usage