Remove singleton variables

No warning during compilation