Eliminate leftover session code from 0.3