Cleanup

Cleanup of code

Signed-off-by: Tony Stephens <tony.stephens@agilex.com>