Switched back to remove API.