Remove assertion code for now (not sure about the best way to do it)