Cleanup after merge
5.1.3