Simplify s3 session management code

1. Don't store nil sessions in the map, delete them from the map instead
2. Don't make unnecessary copies