Remove extra variable in class