HomeIsabelle/Phabricator

cleanup, guided by old FIXMEs