Import cleanup

some random stuff i cleaned up while looking into http://manage.dimagi.com/default.asp?113437