Can we just drop this code?