Cleaned up upstream after fork