added some skeleton for removing singleton