dropped some unused code in A