* chore: get rid of edx_six - not needed anymore * chore: remove reference to TODO that was completed.