removed ReadStrategy and WriteStrategy
Merge commit '18ee3ae2bb4bfd356c8bf2f59117928abfe5b460'