Fix style for old SAs and reduce dependancies