Partial checkin - cleanup, renaming to avoid conflict, bringing in less.