Fix timeboxing and clean up old session code