Remove scan removal hacks as we are now using VoidAnnotationParser

Change-Id: I28af87d84039c511e2378a67bccb9d0c34c55989