More 1.4.6-R0.3 cleanup.

Signed-off-by: Mike Howe <mike@mcsnetworks.com>