sync
added plan and removed cruft
more cleanup