More Hawk cleanup