Can we remove all code that's commented out like this? We can always look at the previous code via git history.