Remove uneeded variables, delint raw.py, and remove options used for debugging.