Removing hardcoded API Key references
Merge branch 'jgs-working'