get rid of the commented code or add some description about what's not done and when should this be uncommented?