commented part of unnecessary code