RavenDB-1914 Code cleanup