Improve picks removal
Fix jsme bug