Merged in cleanup changes from osd branch (nw)