More code cleanup, DESIGNDOC almost done (just need B2)