Should we just remove these instead of commenting out?