Some vars removed, cleanup, update to namecleaner