Cleanup Clayton September 2022

IMG-6157    IMG-6158

IMG-6159