Remove unwraps and expects in non-test code

Edited by opport