Remove singleton

Just merge this