Clean up. This doesn't quite work as 'password' flow anymore.