Remove private[storehaus], fix construction bug