removed a bunch of console logs + on restart cleanup