Remove redundant vars