remove bsa, update header, test on ASO