Removed a lot of logging