clear unneeded notation
fix deactivate flag issues
Merge branch 'New3' of https://github.com/fitzchak/ravendb into New3