EA-45226 (diagnostic); collections abuse fixed
EA-44693 (file deletion: right way)