Remove commented code no longer needed