Some cleanup, fixed a MIRV Baby bug