Removed custom logging code