remove old workaround (and disabled) code