Removed quotes from displayed text. Removed some dead code.