removed remaining session dependency