Remove some logging.
More clean up and variable renaming.