Removed commented out duplicate code