Stripped out unused code that was causing notices/warnings.