Instead of commenting, could we just remove code that is deprecated