Removed dependency on custom logger