Remove expand.
Improve js calls.