Models: remove uneeded None check, 'FIXME's