removed all unused from singleton