Merge branch 'netrom-cleanups'