Fix a few typos and remove unused code (#1041)

Fixes #845
Fixes #844

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
3 files changed