Remove duplicated method and handle session type correctly.