Removed API Keys, fixed settings bugs