Removing redundant EntityConvertInterface
Removing TODO as it is no longer relevant