removed a TODO-ish comment that appears to have been addressed