#2 deleted unused code comments