Ensure unbound is used where we want it and removed all other places Closes #234 See merge request !325