Fixed cleanup delay