cleanup on start seems to be the right way