Utilize cleanup deferreds more properly