Remove TODO since that isn't actually necessary
Remove REVIEW notes re: NotImplementedError