Removed more logging