Removed false positive in read tests relation object find due to method
calling on nil result.
Large cleanup of unused stuff. Moved some things. Some small changes.