removed unused viewer, renamed States