fix: Defer resource usage cleanup until the very end (#3042)

fix: Defer resource usage cleanup until the very end (#3042) #1794