Code review. Removed  some commented code and some warning