Removed more unnecessary logging