Strip out authentication stuff and simplify