removed commented code parts