Cleanup & Directory Handling in static