Remove the singleton object design