Removed console logging from many places