Cleanup from fork