Kamikaze API cleanup

Yet another round
Kamikaze API clean

Yet another round