Some more clean up plus the issues currently causing scans to fail.