Feature/zen 13132

OK, i'd prefer to remove them all then, unless they make the stack traces clearer- i don't think they will really help there though.