Take out todo, since this works
Clean up guest marketplace setup