Get rid of removeCombined hack