Removed commented duplicate code