remove incorrect singleton class