Move file removal into helper, and secondary check for directory removal
Add additional logging and user alert when derived data fails to clear.