1008-1530

More cleanup

Signed-off-by: Steve Lombardi <steve.lombardi@pb.com>