These lines should have been transferred to the new functions as needed.