spin kickstart/minimization cleanups