streamlined cleanup