remove old syntax, cleanup
fix js hints