nit: remove commented code if we aren't going to use it