Cleans up session start handler.  Not ideal, but works.