SWC-1002: really clean up my challenges