Cleanup some quotes
Remove obsolete stuff add 1% JS additional