Deprecating singleton variables, use singleton getter instead

Deprecating singleton variables, use singleton getter instead #38