also, remove the checks in the previous commit, they are done elsewhere