CET Cleanup 5/23

Updated with Ken's requests