header update and removed commented code