cleanup 3/14-16

cleanup 3/21-23

Cleanup 4/11-13