Remove unnecessary constant variables
Remove duplicate declaration of class variable