Remove unnecessary method
Merge remote-tracking branch 'origin/feature/remove-cloud-targets' into develop