Hawk authentication cleanup