Removed singelton vars