Unwanted vars removed