Cleanup and support backport