removed singleton from server