Remove NullpoMinoInternalFrame references where possible