Remove conditional compilation for session flow control