Cleanup annex a further