Cleanup of engine branch.