stopped some static vars staying through stop/starts