clean up fuction calls