removed commented duplicate code