spring-develop: null sessions should be removed

1) null sessions should be removed very quickly
2) minor changes