cleanup 40.10