Remove dependency on bci-middleware completely