Cleanup and simplify kick.