Further pointer removal