Remove duplicate and commented out variable