Some notes
Clean up partly implemented plan