Remove Get-Datastore Calls

Updated to remove Get-Datastore calls.