new: Cleanup. De-duplicate file name removal code.