cleanup, + tests