remove unused import
remove now-unused singleton