removing some ugettext refs; moving some imports in other places