Move cleanup code to separate file
Much better signed-out view