forks cleanup fixed