Remove unnecessary vars