Remove multi var declarations