Make the localSystem property constant and improve teardown