unnecessary var removed