Remove boilerplate for demo, add authentication for setup states