Removing requirement for key and secret