diff --git a/src/simfile_smoketest/args.py b/src/simfile_smoketest/args.py
index b6ef0b4..5902fbc 100644
--- a/src/simfile_smoketest/args.py
+++ b/src/simfile_smoketest/args.py
@@ -1,4 +1,3 @@
-import os
 from typing import Optional
 
 from tap import Tap
diff --git a/src/simfile_smoketest/runner.py b/src/simfile_smoketest/runner.py
index 9779b40..a32109c 100644
--- a/src/simfile_smoketest/runner.py
+++ b/src/simfile_smoketest/runner.py
@@ -2,7 +2,6 @@ from contextlib import contextmanager
 import dataclasses
 from datetime import datetime
 import os
-import sys
 import traceback
 from typing import Iterator, Optional
 
@@ -19,7 +18,7 @@ from simfile.timing.displaybpm import displaybpm
 from simfile.types import Simfile, Chart
 
 from .args import SmoketestArgs
-from .storage import *
+from .storage import Run, SimfileObject, SimfileError
 
 
 @dataclasses.dataclass(frozen=True)
diff --git a/src/simfile_smoketest/storage.py b/src/simfile_smoketest/storage.py
index 9281b0d..813371d 100644
--- a/src/simfile_smoketest/storage.py
+++ b/src/simfile_smoketest/storage.py
@@ -1,4 +1,4 @@
-from peewee import *
+from peewee import Model, DateTimeField, CharField, IntegerField, ForeignKeyField, SqliteDatabase
 
 
 DB = SqliteDatabase("smoketest.db")