DC21-428: Remove overlapped files from system