Fix Cleanup path finding