Can we remove this instead of commenting out?