fix: dont crash on restart
cleanups