some cleanup
5.10 extended