Removing $log dependency