Cleanup from merge develop.