Remove singleton pattern