These were a "security" feature but pre-emptive and just add complications when we can implement secrets later