can we just remove this code?