General tidy up

Remove unused $data

Change-Id: I8f870d291388828c1a480a9f54d1aa302c7d3b68