Clean up the apis