please remove all commented code from this files and other files