Remove static variables