fix(cleanup): Only run cleanup if there are things to cleanup