Clean up some more templates - fix deprecated cookie clearing