Cleanup

Change-Id: I5e1ec4df515b80025f37d884c5b02dcdc53710ef
Signed-off-by: Rob <robert.healy3@gmail.com>