commented code and deleted useless code