updates for Folsom glance
better cleanup
Merge branch 'stable/essex'