(#1578) - Don't return from utils.cleanup prematurely