* improved resource clean up
* stale check on update