massive cleanup for 72X