Trying to remove singleton instances