Removed hard-coded logging