Remove singleton for now after discussions