removed dead commented code
cleaned up code