Clean up to ensure isAuthenticated()