try and get more code compiling during scan
remove old workaround where not requiried
remove uneeded config