Issue #59 Simplifying the code in the context of file removals