Remove Session Dependency