Rolled some changes back a little and removed some logging.