some clean up and added skada import for affinitii config