Remove TODO I didn't have time for