some untested cleanup <3