Removing some more dual DB reads.

Issue: BMS-148
Reviewer: RebeccaB