Remove the singleton methods