Added clearing of static values