Removed deprecated commented code