- removed unneeded commented code