Cleanup 6.1.2