clean up unused macros
update scanning macros
add scan site_config file