Code review MPF-91 (remove empty define dependencies)