Added API cleanup.