removed deprecated function and more test clean-up