Remove TODO (already listed in Issues)