remove some special-casing

until we can profile this properly and determine that it is an issue, there is no point :D