Cleanup from sha256 model. Almost there...