removed commented code #7