Removing requirement for key and secret
Updating default data
Removing secret and key