Added clearing of static values
Revert "Added clearing of static values"

This reverts commit 2c8e3178e48749bb3268693276979cf322c6a395.