RavenDB-2350 Code cleanup