Need logging here for DEBUG or safe to delete this?