Clean up measure planning.