Removed closed beta handling #1666

Here are the changes for removing the closed beta stuff. It's running into the flashlight restarting stuff, so is a bit tough to test end-to-end, but I think this part should generally be alright.