Clean up dependency on hanwen's packages.