removed obsolete if statements (domain sub takes care of this)