removed unneeded commented code