remove old unnecessary var declarations