remove unused singleton, adjust log interface