Remove singleton from Config