Kamikaze API cleanup