remove commented code and the comment above?
it the comment still valid here?