Removed some unused data members and some console logging.