cleanup, so testing will be easy