fix cleaning up non-normal files and provide better messaging