updates for Folsom glance
better cleanup