Remove initialisation for state variables