Pulled out obsolete async code

Partially added BSA# support