File location cleanup