WIP remove voodoo code, add inactivity timeout