cleanup + removed version pinning