All unnecessary logging removed