Remove singleton code from further down